Rename Phase-2 "2026" geometries and workflows to "Run4" #46582

srimanob · 2024-11-01T23:31:11Z

PR description:

Request in #46028
This PR renames the 2026 workflows to Run4. Additionally, the geometry filenames have been updated to reflect this change, as 2026 will now fall under Run-3 due to the updated LHC schedule.

Note that

This PR also removes some obsolete files.
This PR does not touch geometry XML files in folder with "2026". I leave this to geometry expert to handle properly.

Note on how I did:

#!/bin/tcsh                                                                     

#GeometryExtended2026D                                                          
#cmsExtendedGeometry2026D                                                       
#Extended2026D in Configuration/StandardSequences/python/GeometryConf.py 
#GeometryExtended2026 in Geometry/HGCalGeometry/test/python
#GeometryDD4hepExtendedRun4D*Reco (change 2026 to Run4)

set count2026D = `more $1 | grep cmsExtendedGeometry2026D | wc -l`
echo $1
if ($count2026D > 0) then
    echo "CHANGE"
    rm -rf phat.temp
    sed s/cmsExtendedGeometry2026D/cmsExtendedGeometryRun4D/g $1 >! ./phat.temp
    mv phat.temp $1
endif
unset count2026D

#Change filenames using                                                         
#l *.py | grep 2026 | awk '{print $9" "$9}' | sed s/2026/Run4/ | awk '{print "g\
it mv "$2" "$1}' > ! phatRun4.csh; chmod a+x phatRun4.csh;                      
#                                                                               
#Geometry/CMSCommonData/python                                                  
#Geometry/CMSCommonData/data/dd4hep (use .xml)                                  
#Configuration/Geometry/python                                                  
#SimG4CMS/Calo/test/python                                                      
#SimG4Core/PrintGeomInfo/test/python                                            

#Change 2026 to Run4                                                            
#Configuration/PyReleaseValidation                                              
#Configuration/HLT                                                              
#Fireworks/Geometry/test                                                        
#2026=>Run4 

#Update workflow in runTheMatrix

PR validation:

Dump output using runTheMatrix.py --what upgrade -l 29634.0 --wm init
Use output file (in "29634.0_TTbar_14TeV+Run4D110") from previous to run

If this PR is a backport please specify the original PR and why you need to backport that PR. If this PR will be backported please specify to which release cycle the backport is meant for:

No need of backport

cmsbuild · 2024-11-01T23:31:54Z

cms-bot internal usage

cmsbuild · 2024-11-01T23:36:12Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-46582/42471

There are other open Pull requests which might conflict with changes you have proposed:
- File Configuration/Geometry/python/dict2026Geometry.py modified in PR(s): Phase2-hgx360D First attempt to make a Phase2 scenario with 0 overlaps with zero tolerance #46565
- File Configuration/HLT/python/autoHLT.py modified in PR(s): 2025 Wfs Skeleton and Updates to Data Wfs (2024,2023,2022) #46445
- File Configuration/PyReleaseValidation/python/relval_2026.py modified in PR(s): CMSSW Integration of LST #45117, Phase2-hgx360D First attempt to make a Phase2 scenario with 0 overlaps with zero tolerance #46565
- File Configuration/PyReleaseValidation/python/relval_steps.py modified in PR(s): 2025 Wfs Skeleton and Updates to Data Wfs (2024,2023,2022) #46445
- File Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py modified in PR(s): Add run3 tracking low pu era #33532, CMSSW Integration of LST #45117, 2025 Wfs Skeleton and Updates to Data Wfs (2024,2023,2022) #46445, ECAL RecHit producer Alpaka migration #46453, Phase2-hgx360D First attempt to make a Phase2 scenario with 0 overlaps with zero tolerance #46565
- File Configuration/PyReleaseValidation/scripts/runTheMatrix.py modified in PR(s): 2025 Wfs Skeleton and Updates to Data Wfs (2024,2023,2022) #46445
- File Configuration/StandardSequences/python/GeometryConf.py modified in PR(s): Phase2-hgx360D First attempt to make a Phase2 scenario with 0 overlaps with zero tolerance #46565
- File DQM/SiTrackerPhase2/test/dqmstep_phase2tk_cfg.py modified in PR(s): Outer Tracker Phase2 DQM: additional stub validation plots #45475
- File DQM/SiTrackerPhase2/test/harvestingstep_phase2tk_cfg.py modified in PR(s): Outer Tracker Phase2 DQM: additional stub validation plots #45475
- File L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py modified in PR(s): Displaced vertexing gbdt #45672
- File L1Trigger/TrackFindingTracklet/test/HybridTracksNewKF_cfg.py modified in PR(s): Several improvements to L1 tracking code #46360
- File RecoLocalCalo/EcalRecProducers/test/testEcalUncalibRecHitPhase2WeightsProducerGPU.py modified in PR(s): Remove the configuration of the legacy CUDA workflows #46076
- File SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DD4hep_cfg.py modified in PR(s): Phase2-hgx360D First attempt to make a Phase2 scenario with 0 overlaps with zero tolerance #46565
- File SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DDD_cfg.py modified in PR(s): Phase2-hgx360D First attempt to make a Phase2 scenario with 0 overlaps with zero tolerance #46565

cmsbuild · 2024-11-01T23:36:49Z

A new Pull Request was created by @srimanob for master.

It involves the following packages:

Alignment/OfflineValidation (alca)
Alignment/TrackerAlignment (alca)
CalibCalorimetry/HcalPlugins (alca)
CondTools/SiPhase2Tracker (upgrade, alca)
CondTools/SiPixel (db)
Configuration/Geometry (upgrade, geometry)
Configuration/HLT (hlt)
Configuration/PyReleaseValidation (upgrade, pdmv)
Configuration/StandardSequences (operations)
DQM/SiTrackerPhase2 (dqm)
Fireworks/Geometry (visualization)
Geometry/CMSCommonData (upgrade, geometry)
Geometry/ForwardCommonData (geometry)
Geometry/HGCalGeometry (upgrade, geometry)
Geometry/HcalCommonData (geometry)
Geometry/TrackerGeometryBuilder (geometry)
L1Trigger/CSCTriggerPrimitives (l1)
L1Trigger/DTTriggerPhase2 (upgrade, l1)
L1Trigger/DemonstratorTools (l1)
L1Trigger/L1CaloTrigger (upgrade, l1)
L1Trigger/L1THGCal (upgrade, l1)
L1Trigger/L1THGCalUtilities (upgrade, l1)
L1Trigger/L1TMuonOverlapPhase1 (l1)
L1Trigger/L1TMuonOverlapPhase2 (upgrade, l1)
L1Trigger/L1TTrackMatch (upgrade, l1)
L1Trigger/Phase2L1GMT (l1)
L1Trigger/Phase2L1ParticleFlow (upgrade, l1)
L1Trigger/TrackFindingTMTT (l1)
L1Trigger/TrackFindingTracklet (l1)
L1Trigger/TrackerTFP (l1)
RecoHGCal/TICL (reconstruction, upgrade)
RecoLocalCalo/EcalRecProducers (reconstruction)
RecoLocalCalo/HGCalRecAlgos (reconstruction, upgrade)
RecoLocalCalo/HGCalRecProducers (reconstruction, upgrade)
RecoLocalTracker/SiPhase2VectorHitBuilder (reconstruction, upgrade)
RecoMTD/DetLayers (reconstruction, upgrade)
RecoTracker/MkFit (reconstruction)
SLHCUpgradeSimulations/Geometry (upgrade, geometry)
SimCalorimetry/HGCalSimAlgos (simulation, upgrade)
SimG4CMS/Calo (simulation)
SimG4CMS/Forward (simulation)
SimG4Core/PrintGeomInfo (simulation)
SimTracker/TrackerMaterialAnalysis (simulation)
Validation/HGCalValidation (dqm)
Validation/RecoEgamma (dqm)

@AdrianoDee, @Dr15Jones, @Martin-Grunewald, @Moanwar, @alja, @aloeliger, @antoniovagnerini, @antoniovilela, @atpathak, @bsunanda, @civanch, @cmsbuild, @consuegs, @davidlange6, @DickyChant, @epalencia, @fabiocos, @francescobrivio, @jfernan2, @kpedro88, @makortel, @mandrenguyen, @mdhildreth, @miquork, @mmusich, @perrotta, @rappoccio, @rseidita, @srimanob, @subirsarkar can you please review it and eventually sign? Thanks.
@GiacomoSguazzoni, @JanChyczynski, @Martin-Grunewald, @PonIlya, @ReyerBand, @VinInn, @VourMa, @abdoulline, @adewit, @alja, @amarini, @apsallid, @argiro, @arossi83, @battibass, @bsunanda, @cseez, @dgulhan, @dinyar, @dkotlins, @edjtscott, @erikbutz, @eyigitba, @fabiocos, @felicepantaleo, @ferencek, @forthommel, @giovanni-mocellin, @gpetruc, @hatakeyamak, @jbsauvan, @lecriste, @lgray, @makortel, @martinamalberti, @missirol, @mmusich, @mroguljic, @mtosi, @pfs, @ptcox, @rchatter, @rovere, @rsreds, @sameasy, @sethzenz, @silviodonato, @skinnari, @slomeo, @sobhatta, @sroychow, @thomreis, @threus, @tlampen, @tocheng, @tsusa, @tvami, @valuev, @vandreev11, @vargasa, @venturia, @wang0jin, @youyingli, @yuanchao this is something you requested to watch as well.
@antoniovilela, @mandrenguyen, @rappoccio, @sextonkennedy you are the release manager for this.

cms-bot commands are listed here

cmsbuild · 2024-11-01T23:40:29Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-46582/42472

There are other open Pull requests which might conflict with changes you have proposed:
- File Configuration/Geometry/python/dict2026Geometry.py modified in PR(s): Phase2-hgx360D First attempt to make a Phase2 scenario with 0 overlaps with zero tolerance #46565
- File Configuration/HLT/python/autoHLT.py modified in PR(s): 2025 Wfs Skeleton and Updates to Data Wfs (2024,2023,2022) #46445
- File Configuration/PyReleaseValidation/python/relval_2026.py modified in PR(s): CMSSW Integration of LST #45117, Phase2-hgx360D First attempt to make a Phase2 scenario with 0 overlaps with zero tolerance #46565
- File Configuration/PyReleaseValidation/python/relval_steps.py modified in PR(s): 2025 Wfs Skeleton and Updates to Data Wfs (2024,2023,2022) #46445
- File Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py modified in PR(s): Add run3 tracking low pu era #33532, CMSSW Integration of LST #45117, 2025 Wfs Skeleton and Updates to Data Wfs (2024,2023,2022) #46445, ECAL RecHit producer Alpaka migration #46453, Phase2-hgx360D First attempt to make a Phase2 scenario with 0 overlaps with zero tolerance #46565
- File Configuration/PyReleaseValidation/scripts/runTheMatrix.py modified in PR(s): 2025 Wfs Skeleton and Updates to Data Wfs (2024,2023,2022) #46445
- File Configuration/StandardSequences/python/GeometryConf.py modified in PR(s): Phase2-hgx360D First attempt to make a Phase2 scenario with 0 overlaps with zero tolerance #46565
- File DQM/SiTrackerPhase2/test/dqmstep_phase2tk_cfg.py modified in PR(s): Outer Tracker Phase2 DQM: additional stub validation plots #45475
- File DQM/SiTrackerPhase2/test/harvestingstep_phase2tk_cfg.py modified in PR(s): Outer Tracker Phase2 DQM: additional stub validation plots #45475
- File L1Trigger/L1TTrackMatch/test/L1TrackObjectNtupleMaker_cfg.py modified in PR(s): Displaced vertexing gbdt #45672
- File L1Trigger/TrackFindingTracklet/test/HybridTracksNewKF_cfg.py modified in PR(s): Several improvements to L1 tracking code #46360
- File RecoLocalCalo/EcalRecProducers/test/testEcalUncalibRecHitPhase2WeightsProducerGPU.py modified in PR(s): Remove the configuration of the legacy CUDA workflows #46076
- File SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DD4hep_cfg.py modified in PR(s): Phase2-hgx360D First attempt to make a Phase2 scenario with 0 overlaps with zero tolerance #46565
- File SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DDD_cfg.py modified in PR(s): Phase2-hgx360D First attempt to make a Phase2 scenario with 0 overlaps with zero tolerance #46565

cmsbuild · 2024-11-01T23:41:14Z

Pull request #46582 was updated. @AdrianoDee, @Dr15Jones, @Martin-Grunewald, @Moanwar, @alja, @aloeliger, @antoniovagnerini, @antoniovilela, @atpathak, @bsunanda, @civanch, @cmsbuild, @consuegs, @davidlange6, @DickyChant, @epalencia, @fabiocos, @francescobrivio, @jfernan2, @kpedro88, @makortel, @mandrenguyen, @mdhildreth, @miquork, @mmusich, @perrotta, @rappoccio, @rseidita, @srimanob, @subirsarkar can you please check and sign again.

Moanwar · 2024-11-05T18:14:37Z

+Upgrade

jfernan2 · 2024-11-05T18:29:54Z

+1

cmsbuild · 2024-11-05T20:13:31Z

+1

Size: This PR adds an extra 796KB to repository
Summary: https://cmssdt.cern.ch/SDT/jenkins-artifacts/pull-request-integration/PR-ad46ce/42599/summary.html
COMMIT: 8f41eb9
CMSSW: CMSSW_14_2_X_2024-11-05-1100/el8_amd64_gcc12
User test area: For local testing, you can use /cvmfs/cms-ci.cern.ch/week0/cms-sw/cmssw/46582/42599/install.sh to create a dev area with all the needed externals and cmssw changes.

Comparison Summary

Summary:

You potentially removed 1 lines from the logs
Reco comparison results: 4 differences found in the comparisons
DQMHistoTests: Total files compared: 47
DQMHistoTests: Total histograms compared: 2856990
DQMHistoTests: Total failures: 9
DQMHistoTests: Total nulls: 0
DQMHistoTests: Total successes: 2856961
DQMHistoTests: Total skipped: 20
DQMHistoTests: Total Missing objects: 0
DQMHistoSizes: Histogram memory added: 0.0 KiB( 40 files compared)
Checked 167 log files, 150 edm output root files, 47 DQM output files
TriggerResults: no differences found

srimanob · 2024-11-05T20:43:43Z

@cms-sw/orp-l2 I think it looks good now. Thx.

mandrenguyen · 2024-11-05T20:44:38Z

merge
bypassing sigs as discussed at the ORP
Other PRs are expected to go into conflict

perrotta · 2024-11-05T21:15:58Z

+1

Re-signing

smuzaffar · 2024-11-06T07:53:23Z

@srimanob , looks like there are still some refs of GeometryExtended2026D98_cff which was renamed to GeometryExtendedRun4D98_cff . This is causing few unit tests to fail

----- Begin Fatal Exception 06-Nov-2024 07:05:41 CET-----------------------
An exception of category 'ConfigFileReadError' occurred while
   [0] Processing the python configuration file named /data/cmsbld/jenkins/workspace/ib-run-qa/CMSSW_14_2_X_2024-11-05-2300/src/CalibTracker/StandaloneTrackerTopology/test/testStandaloneTrackerTopology_cfg.py
Exception Message:
 unknown python problem occurred.
ModuleNotFoundError: No module named 'Configuration.Geometry.GeometryExtended2026D98_cff'

At:
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02862/el8_amd64_gcc12/cms/cmssw/CMSSW_14_2_X_2024-11-05-2300/src/FWCore/ParameterSet/python/Config.py(762): load
  /data/cmsbld/jenkins/workspace/ib-run-qa/CMSSW_14_2_X_2024-11-05-2300/src/CalibTracker/StandaloneTrackerTopology/test/testStandaloneTrackerTopology_cfg.py(33): <module>

----- End Fatal Exception -------------------------------------------------

srimanob · 2024-11-06T08:42:16Z

@srimanob , looks like there are still some refs of GeometryExtended2026D98_cff which was renamed to GeometryExtendedRun4D98_cff . This is causing few unit tests to fail

----- Begin Fatal Exception 06-Nov-2024 07:05:41 CET-----------------------
An exception of category 'ConfigFileReadError' occurred while
   [0] Processing the python configuration file named /data/cmsbld/jenkins/workspace/ib-run-qa/CMSSW_14_2_X_2024-11-05-2300/src/CalibTracker/StandaloneTrackerTopology/test/testStandaloneTrackerTopology_cfg.py
Exception Message:
 unknown python problem occurred.
ModuleNotFoundError: No module named 'Configuration.Geometry.GeometryExtended2026D98_cff'

At:
  /cvmfs/cms-ib.cern.ch/sw/x86_64/nweek-02862/el8_amd64_gcc12/cms/cmssw/CMSSW_14_2_X_2024-11-05-2300/src/FWCore/ParameterSet/python/Config.py(762): load
  /data/cmsbld/jenkins/workspace/ib-run-qa/CMSSW_14_2_X_2024-11-05-2300/src/CalibTracker/StandaloneTrackerTopology/test/testStandaloneTrackerTopology_cfg.py(33): <module>

----- End Fatal Exception -------------------------------------------------

Thx. I am taking care of this.

mmusich · 2024-11-06T09:09:50Z

Thx. I am taking care of this.

@srimanob @smuzaffar
I noticed that this broke also some TSG tests, so I went ahead and created #46608

bsunanda · 2024-11-06T10:16:59Z

@srimanob @mmusich I am looking into a few areas like Geometry/*CommonData SimG4Core/PrintGeomInfo and a few others for Simulation and Geometry. Please do not touch those

…

________________________________ From: Marco Musich ***@***.***> Sent: 06 November 2024 14:40 To: cms-sw/cmssw ***@***.***> Cc: Sunanda Banerjee ***@***.***>; Mention ***@***.***> Subject: Re: [cms-sw/cmssw] Rename Phase-2 "2026" geometries and workflows to "Run4" (PR #46582) Thx. I am taking care of this. @srimanob<https://github.com/srimanob> @smuzaffar<https://github.com/smuzaffar> I noticed that this broke also some TSG tests, so I went ahead and created #46608<#46608> — Reply to this email directly, view it on GitHub<#46582 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/ABGMZOQHALUMCL66BDJ5VR3Z7HMHRAVCNFSM6AAAAABRBEAVZ6VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDINJZGA3TIMBXHA>. You are receiving this because you were mentioned.Message ID: ***@***.***>

fix a bunch of tests broken by #46582

cmsbuild added this to the CMSSW_14_2_X milestone Nov 1, 2024

cmsbuild added reconstruction-pending simulation-pending dqm-pending l1-pending hlt-pending alca-pending db-pending geometry-pending operations-pending visualization-pending pending-signatures tests-pending orp-pending pdmv-pending upgrade-pending code-checks-pending tracking trk labels Nov 1, 2024

cmsbuild added code-checks-approved and removed code-checks-pending labels Nov 1, 2024

cmsbuild added code-checks-pending and removed code-checks-approved labels Nov 1, 2024

cmsbuild added code-checks-approved and removed code-checks-pending labels Nov 1, 2024

cmsbuild added geometry-approved simulation-approved labels Nov 5, 2024

cmsbuild added upgrade-approved and removed upgrade-pending labels Nov 5, 2024

cmsbuild added reconstruction-approved and removed reconstruction-pending labels Nov 5, 2024

cmsbuild added tests-approved and removed tests-started labels Nov 5, 2024

cmsbuild added orp-approved and removed orp-pending labels Nov 5, 2024

cmsbuild merged commit b156398 into cms-sw:master Nov 5, 2024
11 checks passed

cmsbuild added alca-approved db-approved and removed alca-pending db-pending labels Nov 5, 2024

mmusich added a commit to mmusich/cmssw that referenced this pull request Nov 6, 2024

fix a bunch of tests broken by cms-sw#46582

3412226

mmusich mentioned this pull request Nov 6, 2024

fix a bunch of tests broken by cms-sw/cmssw#46582 #46608

Merged

mmusich mentioned this pull request Nov 6, 2024

TICLv5a : Improve skeleton linking and parameters tuning #46539

Open

cmsbuild added a commit that referenced this pull request Nov 8, 2024

Merge pull request #46608 from mmusich/mm_fixes_post-46582

e773726

fix a bunch of tests broken by #46582

srimanob mentioned this pull request Nov 13, 2024

Several improvements to L1 tracking code #46360

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rename Phase-2 "2026" geometries and workflows to "Run4" #46582

Rename Phase-2 "2026" geometries and workflows to "Run4" #46582

srimanob commented Nov 1, 2024 •

edited

Loading

cmsbuild commented Nov 1, 2024 •

edited

Loading

cmsbuild commented Nov 1, 2024

cmsbuild commented Nov 1, 2024

cmsbuild commented Nov 1, 2024

cmsbuild commented Nov 1, 2024

Moanwar commented Nov 5, 2024

jfernan2 commented Nov 5, 2024

cmsbuild commented Nov 5, 2024

srimanob commented Nov 5, 2024

mandrenguyen commented Nov 5, 2024

perrotta commented Nov 5, 2024

smuzaffar commented Nov 6, 2024

srimanob commented Nov 6, 2024

mmusich commented Nov 6, 2024

bsunanda commented Nov 6, 2024 via email

Rename Phase-2 "2026" geometries and workflows to "Run4" #46582

Rename Phase-2 "2026" geometries and workflows to "Run4" #46582

Conversation

srimanob commented Nov 1, 2024 • edited Loading

PR description:

PR validation:

If this PR is a backport please specify the original PR and why you need to backport that PR. If this PR will be backported please specify to which release cycle the backport is meant for:

cmsbuild commented Nov 1, 2024 • edited Loading

cmsbuild commented Nov 1, 2024

cmsbuild commented Nov 1, 2024

cmsbuild commented Nov 1, 2024

cmsbuild commented Nov 1, 2024

Moanwar commented Nov 5, 2024

jfernan2 commented Nov 5, 2024

cmsbuild commented Nov 5, 2024

Comparison Summary

srimanob commented Nov 5, 2024

mandrenguyen commented Nov 5, 2024

perrotta commented Nov 5, 2024

smuzaffar commented Nov 6, 2024

srimanob commented Nov 6, 2024

mmusich commented Nov 6, 2024

bsunanda commented Nov 6, 2024 via email

srimanob commented Nov 1, 2024 •

edited

Loading

cmsbuild commented Nov 1, 2024 •

edited

Loading